From 2eb4f7a7dfd302d945a87c1f4bc0f98ef21ec1e2 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Fri, 6 Oct 2006 08:09:52 +0100 Subject: [PATCH] [HVM][SVM] Revert changeset 11679:a949bd6ceb85 Although in the correct spirit, it seems there is some other dependency in the code that assumes ExtInts are queued until thay can be immediately delivered (EFLAGS.IF==1). This patch therefore caused instability in Linux guests. Signed-off-by: Keir Fraser --- xen/arch/x86/hvm/svm/intr.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xen/arch/x86/hvm/svm/intr.c b/xen/arch/x86/hvm/svm/intr.c index 063e919cb3..0f30bd5478 100644 --- a/xen/arch/x86/hvm/svm/intr.c +++ b/xen/arch/x86/hvm/svm/intr.c @@ -74,6 +74,7 @@ asmlinkage void svm_intr_assist(void) int intr_type = APIC_DM_EXTINT; int intr_vector = -1; int re_injecting = 0; + unsigned long rflags; ASSERT(vmcb); @@ -86,6 +87,14 @@ asmlinkage void svm_intr_assist(void) re_injecting = 1; } + /* Guest's interrputs masked? */ + rflags = vmcb->rflags; + if (irq_masked(rflags)) { + HVM_DBG_LOG(DBG_LEVEL_1, "Guest IRQs masked: rflags: %lx", rflags); + /* bail out, we won't be injecting an interrupt this time */ + return; + } + /* Previous interrupt still pending? */ if (vmcb->vintr.fields.irq) { // printk("Re-injecting IRQ from Vintr\n"); -- 2.30.2